From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 25 Oct 2013 19:38:15 +0000 (+0000)
Subject: Merge changes I61f10917,Id5b9872e
X-Git-Tag: 1.31.0-rc.0~18387
X-Git-Url: http://git.cyclocoop.org/%7D%7Cconcat%7B?a=commitdiff_plain;h=a681e58f4ee095eab5064ca78be4d5a7765cc6a1;p=lhc%2Fweb%2Fwiklou.git

Merge changes I61f10917,Id5b9872e

* changes:
  mw.loader: Always log exceptions caught from userland callbacks
  mediawiki.js: Handle error better in log() and move out of mw.loader
---

a681e58f4ee095eab5064ca78be4d5a7765cc6a1